Remove stale Vulkan compile gates and legacy OpenGL cvar wiring#253
Draft
cursor[bot] wants to merge 1 commit into
Draft
Remove stale Vulkan compile gates and legacy OpenGL cvar wiring#253cursor[bot] wants to merge 1 commit into
cursor[bot] wants to merge 1 commit into
Conversation
- Drop dead non-PBR shader init fallback in vk_shader_modules.c (USE_VK_PBR is always defined for the Vulkan renderer). - Remove unused USE_TESS_NEEDS_* and USE_VBO_GRID compile gates; grid VBO path and unconditional normal/ST2 tessellation are now the only path. - Gate r_allowSoftwareGL/r_glDriver registration behind USE_OPENGL_API on Vulkan-only client builds; SDL GLimp only references them when OpenGL is compiled in. - Extend regression/compat guards to prevent reintroducing removed flags. Co-authored-by: Tim Fox <timfox@outlook.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Flags removed
USE_VK_PBR#elsebranch invk_shader_modules.cUSE_VK_PBRis unconditionally#defined intr_local.hfor Vulkan; the non-PBR shader init path was unreachable dead code (~120 lines).USE_TESS_NEEDS_NORMAL/USE_TESS_NEEDS_ST2compile gatestr_local.h(permanently off). Unwrapping#ifdefguards preserves current behavior: normals and ST2 are always tessellated on surface paths.USE_VBO_GRIDcompile gateUSE_VBOis on (also always on). Grid surfaces always use the VBO fast path; the#ifdefadded noise without a live off-path.r_allowSoftwareGL/r_glDriverregistrationUSE_OPENGL_API(still available for MSVC/OpenGL-capable builds).Not removed (low confidence)
r_renderMode— Now wired for deferred G-buffer (r_renderMode 1) and Forward+ latch (r_renderMode 2) viatr_render_mode_vk.c; prior cleanup attempt was outdated.r_forwardPlus,r_vbo,r_pbr,r_volumetricFog, RTX cvars.Behavioral parity checks
./scripts/compile_engine.sh vulkan— pass (Release build, client/server/Vulkan renderer copied torelease/).bash tests/scripts/test_vulkan_regression_source_guards.sh— pass (new guards pin PBR-only shader init, absentUSE_VBO_GRID/USE_TESS_NEEDS_*macros).bash scripts/q3_openarena_compat_check.sh— pass (14/14, including newUSE_OPENGL_APIgate check forr_allowSoftwareGL).